icon-theme: Add some preconditions for NULL arguments

Related to this crash: https://bugzilla.gnome.org/show_bug.cgi?id=687967

https://bugzilla.gnome.org/show_bug.cgi?id=687977

diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 764320b982da8cef6397fcb3f2a5c6a85a1772ff..90806ee43246bab923b637885689c322d6d5448c 100644 (file)
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -3318,6 +3318,7 @@ gtk_icon_info_load_symbolic (GtkIconInfo    *icon_info,
   gchar *icon_uri;
   gboolean is_symbolic;
 
+  g_return_val_if_fail (icon_info != NULL, NULL);
   g_return_val_if_fail (fg != NULL, NULL);
 
   icon_uri = NULL;
@@ -3398,6 +3399,9 @@ gtk_icon_info_load_symbolic_for_context (GtkIconInfo      *icon_info,
   gchar *icon_uri;
   gboolean is_symbolic;
 
+  g_return_val_if_fail (icon_info != NULL, NULL);
+  g_return_val_if_fail (context != NULL, NULL);
+
   icon_uri = NULL;
   if (icon_info->icon_file)
     icon_uri = g_file_get_uri (icon_info->icon_file);
@@ -3485,6 +3489,9 @@ gtk_icon_info_load_symbolic_for_style (GtkIconInfo   *icon_info,
   gchar *icon_uri;
   gboolean is_symbolic;
 
+  g_return_val_if_fail (icon_info != NULL, NULL);
+  g_return_val_if_fail (style != NULL, NULL);
+
   icon_uri = NULL;
   if (icon_info->icon_file)
     icon_uri = g_file_get_uri (icon_info->icon_file);